check button: Update for new box gadget functionality
authorMatthias Clasen <mclasen@redhat.com>
Fri, 28 Oct 2016 16:58:18 +0000 (12:58 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 1 Nov 2016 18:29:25 +0000 (14:29 -0400)
The box gadget now does the render node conversion for
all its children, so we have less work to do.

gtk/gtkcheckbutton.c

index 646ea6ac1ee397482f1d2f065e796069ad5d4b3d..5d0d8af01c0d0e77294fb87df735eecf250b30a9 100644 (file)
@@ -387,28 +387,13 @@ gtk_check_button_get_render_node (GtkWidget   *widget,
                                   GskRenderer *renderer)
 {
   GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (GTK_CHECK_BUTTON (widget));
-  GskRenderNode *res;
-  GskRenderNode *node;
 
   if (!gtk_toggle_button_get_mode (GTK_TOGGLE_BUTTON (widget)))
     return GTK_WIDGET_CLASS (gtk_check_button_parent_class)->get_render_node (widget, renderer);
-
-  res = gtk_css_gadget_get_render_node (priv->gadget,
-                                        renderer,
-                                        gtk_widget_has_visible_focus (widget));
-
-  if (res == NULL)
-    return NULL;
-
-  node = gtk_css_gadget_get_render_node (priv->indicator_gadget,
-                                         renderer,
-                                         FALSE);
-  gsk_render_node_append_child (res, node);
-  gsk_render_node_unref (node);
-
-  gtk_container_propagate_render_node (GTK_CONTAINER (widget), renderer, res);
-
-  return res;
+  else
+    return gtk_css_gadget_get_render_node (priv->gadget,
+                                           renderer,
+                                           gtk_widget_has_visible_focus (widget));
 }
 
 GtkCssNode *